Attempt to cleanup/refactor FluorineFx