Fix long line error and other comments