Make code less ugly