Alter coding style and tidy up a bit