GENERAL - fixes according to sonar