Make code simpler