refactoring, more coverage love