Minor cleanup in modules