minor opitimization