Minor file tidying...