Merge "Minor code refactor for readability." into lmp-mr1-ub-dev