Restructured code to be less confusing to static code analysis tools