cleaning up module based on CR comments