Cleaning up imports, adding to desctiptions