STYLE: code refactoring