Improving the Code