REFACTOR: Updated User class so that it meets coding conventions