Cleaning up some imports and formatting