Refactor to simplify in 15 jan