Code now looks good