code cleanup
Merge pull request #385 from Qwinix/issue_382

code cleanup