Code Cleaning
Merge pull request #86 from Anu6is/cleanup

Code Cleaning