cleaning up and updating module file