Refactor ROI class

Small clean-up of ROI class.