Feature/mob 2395 singleton

formatting - missing spaces; magic number