Cleaned up the code
Merge pull request #1 from protecinnovations/imp/cleanup

Cleaned up the code