Attempting to keep whitespace consistent, and correcting a type