cleanup/refactor