Some code cleanup before tackling some of the opening scan editor changes and visualization updates to the side bar.