Minor tweaks - clean up