Fix typos, improve consistency

See issue #144