clean-up work

[Clean Code](https://www.42lines.net/2012/07/06/clean-code-reducing-wtfs-per-minute/) === Quality Code
![wtfs-minute](http://www.osnews.com/images/comics/wtfm.jpg)
fixes #91, #87 ([Stinky!](http://martinfowler.com/bliki/CodeSmell.html))