Import changes, cleanup and format.
Better Source Location formatting