Code Style changes