cleanup + minor change