Simplify class name + lint fixes