Minor Coding practice changes
Merge pull request #1 from stevish-com/patch-1

Cleaned up some old code