Addressing #23 and tidying recoding