Bring back seperated var statements
Remove XLint related files
Better error message escape
User friendly logging