Implements @bobsilverberg's recommended changes