Another todo 41 Refactor