heading toward v1.0: code review