Cleaned up Controller and User