Syntax and style improvements proposed by travitch