Cleaned up initializer.