Refactor static methods