Code changed for better reading of it