cosmetic changes, adding logging