make options usage more efficient per code review
cleaned up stack context per code review