Code Style and cosmetic changes