refactor to galvanize