Code cleanup
Merge branch 'Java-Branch' of https://github.com/Wmaarts/PROJ2_V_42IN02VTSOa into Java-Branch