Refactor amounts