refactor initial workflow
Oops cleanup