remove Log.{e,i}
fix some lint issues