Improve setup steps