Clean up comments
Make assert actually do something