Improve static code checking