tidying up
reminders added in comments