Reworked logging statements