Fixed several inconsistencies related to code style