cleaned up users controller