Renamed file
Improved code. Part 1
Merge pull request #1 from pH-7/master

Improvement -- cleaning up code so that it adheres to standards better.