Small reactoring.