Simplify code, improve coverage