Typo fixes, Making instance a class property