refactoring names, and addition of static methods