Optimize/Cleanup

No idea what performance increase this will give, there will be one for creation though. There are also optimizations throughout that will give slight speed increases and protect against falsey compares.
Startup time is something people will care about down the line. Might as well change to a more optimized solution now, and move to.

It's obscure for someone looking from the perspective of just this repository.