Refactor; add fns