Fixed typos, mixing comments and removed unused method
Merge pull request #495 from soltysh/common_fixups

Merged by openshift-bot