Refactor code to use WAX and other recommendations per issue 307

mcfarhatrequested to merge
mcfarhat-307-adjust_condenser_calls_wax_refactor into develop

Modifications related to issue #307 (closed)

Merge request reports