minor performance tweaks (#11)