Contador: 'I am in better shape for this year's Tour'