Formatting cache and nagios_data model files
Removed legacy fb function calls
Formatted nagios_data model