Added location (file/line) to warnings list
Cleanup