Cleaned up user controller