First good edit I have made in a while.