Some cleanup, use 140 character margin