Code Style refactor.