cleanup per Lethalman's suggestions