little bit refractoring