Code cleanup in DefaultController to reduce phpcs violations.