Cleaned up files + removed useless code.
Cleaning up file + removed useless code.
Merge pull request #2 from aaranmcguire/master

Code Cleaning