fixes #92 - dirty/quick fix
more coding style changes
tests refactoring