Refactored fic mvc