Simplify implementation even more
Simplify implementation even more

bculkin2442/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke