Code optimization
Merge pull request #1 from Turner45/testgit-2.0

Code optimization