Code Style fixes for modules