preparing for pull request. cleaning code.