Small cleanup / speedup