Cleaning up CV a bit