Students - Improving the code