[@Aspen Wren]
I've made the changes you asked for.