Refactor controllers to remove unnecessary local properties