I will rewrite them anyway as discussed, as they are used in only one file at the moment. Thanks!