Ricard: Tidy up code re check of variable initialisation