Commenting code and cleanup interface and test driver