[FIX] issued based on code review - create shorter method