Code Style revision