Refactors some static methods