improvements based on review, especially renaming the modules once extracted