InputConverter: Clean-up ahead of refactoring

Cleaning this class. Mostly minor white-space changes, but making this as a separate MR as it will make the review of the planned refactoring easier.