cleaned up methods in user controller