wee bit o cleanup to code