Cleaned up clients_controller