Some more refactoring
Some more refactoring

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