I agree, this class is a mess, and needs big refactor. Since this library is a must on every project we should have a small meeting about what to do with it, must we refactor the code as soon as we see the problem? or go into a bugfix and small features nightmare?