Changed module declarations to avoid deep-nesting and -indenting.