minor refactor, doc improvements