Clean up initialisation a bit