Simplified the Users controller