Changes to make style better