Code Improved