Fixed #20, closed #21
minor refactoring, removed some excess, undocumented code
0.0.5