Remove unneeded lines and change arrangment.