Code quallity changes
Refactor accountant functionallity still buggy