Style fixes for next release

Updating style errors for upcomming release