Removed random whitespace in various places