Update of Ada code for SW alignment

First step in using SPARK for improving the code