Simplify simulation logic