Simplify module a little bit.