Code refactoring (#1)