OPT improvements after code review