fix bug where module name was truncated
cleanup