Cleaned up comments and ASSERTS.