studio-api sonar issues

Fixed sonar issues