No changes in the code so far, just code cosmetics