[refactoring] cleaned up execution scheduling