Make code less error prone