Code cleaning
Merge pull request #2 from webdevbrian/pr/1

Code cleaning