Tiding up the Main Classes.