Showroom refactoring and cleanup.