Code Style fixes