some cleaning before submitting the pull request