Refactor fmaven