#2 refractoring in some methods