Better logging. Refatoring for unused fields.