Small changes to grammar, and prettifying code