-- fixed formatting, static errors and replaced contribution_type to financial_type