Tidy-ups prior to first commit