Refactoring errors in Accounts
Refactoring errors in Price
Merge remote-tracking branch 'origin/master'