Improve code safety