Tidying up for a basic public form