Simplify and update setup.