Made code looks better#2