Code clean-up#168

rimi-itk merged 3 commits intoOS2Forms:developOS2Forms/os2forms:developfrom

itk-dev:feature/code-cleanupitk-dev/os2forms:feature/code-cleanupCopy head branch name to clipboard