simplify code
Merge pull request #758 from my-personal-forks/cleanup

simplify code