Cleaning up before submitting pull request