Finished refactoring finance object.

Aligned some comments properly.