Improving class