Just little cleanups here and there.