Tidying up prior to releasing for feedback