Cleanup NASA per @audiodude 's comments