Better code checking