Cleanup per jay's suggestions