- Refactored go routines