Yes, your are right. I can improve it and make it much more modular. But I will not some time to do it. Maybe during Easter