remove duplicate class; less nesting