small optimizations
code scrubbing
tightening codebase