Further codebase improvements

Description

None

Environment

None

Status

Assignee

Sergiu Dumitriu

Reporter

Krista Pace

Labels

None

External issue ID

None

External issue ID

None

Sprint

Priority

Medium