Cosmetic cleanup, eliminating double nesting of modules which visually reads a bit cleaner, less nesting