Refactor applied to Auction scaffolding