Clean up linting rules
Improve logging for source expansion