Refactored simulation check scripts