VID-648 design review and code cleanup