#1, #37 refractoring