Use clusterphone. Fix lint issues.