refactoring using prefixes