Enh: code refactoring