#3 Refactoring - Code Style