addressing implementation and formatting concerns raised by @tractorcow