Fixed issues with classes

Fixed syntax issues with classes