Code optimization
Merge pull request #1 from weedzcokie/master

Code optimization