PLA-833 making variables more descriptive, adding logging