Code improvement
Merge pull request #132 from zoic21/master

Code improvement