remove space per comments

Move lines around per comments