Minor restructirisation of lines and names