Refactoring: Improved code style