Minor cleanup
Updated model