Make small changes to ensure a consisten

coding style