Code beautification in Services class.