Comment by binux

To make it more flexible and easy to reuse? I have implemented most features I need now.