Improves setup script