Clean up and componentize FCModel