minor cleanup, bugfix
more cleanup & refactor
1.1.2