formatting cleanup on models