Cleaned up shitty code
Merge pull request #41 from buren/clean_up

Cleaned up shitty code