Changes to variable names, added exit condition in execute()