Removed !necessary variables, added spacing