padrino refactor