Minor changes acc. to the 1st rule of optimization