a few little cleanups