Agreed. I would advise against changing all this code at once and while implementing a new feature, but since it's done already and if @akatsoulas feels confident that this is OK we can carefully proceed.