Total cleanup v2

Edited version of PR https://github.com/CakeDC/search/pull/111 without the copyright statement changing commit:
https://github.com/ravage84/cakedc_search/commit/8e3f3dc0d6d897352ff17d4d960daeb797eb67ee

I will create another PR for the copyright statement changes.