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.
The upstream code will follow our standards. You can use whatever solution you wish downstream.