Post first commit tidy up