Refactor, cleanup some logic
Merge pull request #30 from frewsxcv/cleanup

Refactor, cleanup some logic