Removed whitespace & other minor fixes