Sublime Text 3 compatibility
Better use of variables