cleanup defaults; drop wrapping module scope