Performance optimizations
Minor clean up