No code changes, just making the controller code readable