Improved code semantic