Minor cleanup to prepare for publishing to npm