Simplify & ensure require
Simplify work