Cleaned up fdm namespace