Cleaned up the workflow