Data model cleanup and documentation