Rename things. Update comments. Add test case.