Fix single line comments in executeHandler