core: cleanup after merge
core: minor change (methods order)