Clean-up as per @catlee feedback