Small cleanup

Added some spaces for readability and some minor changes.