Cleaned up source code with CodeMaid