WIP refactor unify split methods
get rid of obsolete comments, renaming