Main Controller - code comments
Error controller - code cleanup and comments