cleanded up controllers