source: cleanup/refactor