BTN-1394: address code review comments

This MR had been created for reviewers to add comments on OET code, and for Buttons to address issues that can be quickly fixed.