Styling and factory refactor to change naming slightly