Fix condense vars

Simplified variable declaration whilst maintaining original functionality.

Merge request reports