Performance improvements + moved private method where it belongs