refactor to get rid of FinMap without Maybe entirely