Refactored structure of financial code