Code improvement
Merge pull request #133 from zoic21/master

Code improvement