Also clean up this syntax