Cleaning up code but not sure what to do about whitespace