Code cleanup (improves static code analysis results)