Style fixes for consistency