Make code nicer