Probably yes! Good idea, thanks! I'll take a look at code again and if there is nothing against I'll push one more commit.