Reduced repetitive classes, typo fix