misc. cleanup to simplify things