Cleanup per @fureigh's comments