small refaktor update