Fix unneeded lines, do some text formatting while I am in here