cleanup setup and comments to indicate its purpose