Changes to make style consistent