code re-org, minor improvements