Improving, cleaning up