Small cleanup (last commit)