Make less ugly