Refactored challenge methods to use refactored user class methods