Code improvement
Merge pull request #131 from zoic21/master

Code improvement