thesp0nge Merge pull request #269 from thesp0nge:cleanup_codebase