Clean up code
Merge pull request #3 from lmsilvera/clean_up_code

Clean up code