optimize
minor change