Also restructured code to remove duplication