TODOs of optimizing the tight loop, multi-startup, misc. cosmetic refactoring