Cleaned up controller syntax