Style changes from Zeno's feedback