Minor Refactoring- Amount