make the code looks better