Cleans up some small things and comments