Some final cleanup before pull request