Minor refactors.
WIP: expense reporting.