cleanup code and forgo some micro-optimizations…