Refactoring / Code style