minor cleanups
require at least one space after "type"

Closes gh-41