Added review comments - controllers