Improved code tool