refactor and stuff
Merge pull request #5 from cguanzon/cleanup

refactor and stuff