improve readability of Controller.php