Minor refactor

refactor, remove s


Please ignore changes for execute() … it’s not done.