Whitespace fixed, whitespace-related stuff added