Make code safer