Further simplify code, cover class and required methods as well