finalize initial refactoring
Merge pull request #2 from piratebroadcast/refactor2

finalize initial refactoring