Fix whitespace after generic type issue
Fix class attribute/method alignment (left)