[] Simple code refactoring