Finance API + Models: Minor refactoring.