General tidy ready to branch.