Add little cleanups