Refactored receipt creation to not use builder