Refactoring and fixing price display