Make changes per @FinalAngel’s comments