code cleanup
Merge pull request #2 from cklee75/5.0.6_ck-R

further cleanup