little refactor @danielatdigital @dahernan