refactor - follow up

1) consistent naming
2) removed unnecessary classes
3) removed (some) code duplicities