Refine setup steps