Fixing whitespace formatting issues