Refactor and unit tests
Bugs
UI workflow
.
Fix
Cleanup
Merge pull request #26 from Trimmers/review/refactor

Review/refactor