Prettier comments and names