Fix compatibility
Git revert fba5c50
Reformat code, add dependency to flame/modules