Add some assert messages and clean up some formatting. 
1 file changed