MADS: Cleanup of fields and constants usage