Tidying up prototypes