Make aesthetic changes to reflect present coding style