code cleanup
Merge pull request #46 from Asitha/mb-838

Code refa