Cleanup and comment update