mod - minor cleaning