Move logic around #amount in expense vs income
Removing unnecessary attr on call to factory
Minor wording change
Drop factorygirl, improve specs, split controllers