#201 cleanup to match coding standards