optimization
Big cleanup and restructuring
Merge branch 'derk' of https://github.com/i3anaan/serialkiller into derk