Clean up comments. Add more tests.