VID-1641 Fix spacing and static method access