Cleanups
micro-optimize a bit