Remove useless require
Use keyword arguments to clean up initializers