Clean up comments
Clean up comments
Clean up comments
Clean up comments, add test case