small code refactor
likes support