macro cleanup; from Kaspars at Bankovskis dot net