Minor tweaks
Better syntax