Simplify based on previous submissions and nitpick from @toolkit