Clean up the code
Merge pull request #1 from GBratsos/clean_up

Clean up the code