Do some little cleanups