Clenaing up the line