> So, once stuff is in place we have oversight again and its time for some cleanup refactoring

+1