code looks better now