minor refactoring
minor refactoring
added tasks to wait for instance and volume states to change to some particular state