[FrameworkBundle] applied advices from gh comments