Refactor (simplify) interfaces