Improved code annotation