Small cleanup and prettifying