Tidy things up a bit for prototyping