Finalize splitter class. Working version