fixed all kibit warnings