fixed tabs and spaces, and corrected lint errors