changes after feedback from @davecgh.