Neaten things up