Some small cleanup before pull request