Coding style refactoring - Part 1
Coding style refactoring - Part 2