Fix incorrect BOOL nsinvocation; Small refactoring;