Making a few changes in imports and reformatting other parts of code