Extracted :helper and clean up configurable