Refactor finish up pt1