module_name deprecation
fix some line lengths