Changes post sonar analysis, move version to release