more refaktoring