Final cleanup before submitting pull request