Add further improvement abour source locations
Add further improvement about formatting