Improve setup bash script