Change the use of User methods as static methods, to improve readability