Code is significantly less ugly