Refactored logging. Finished catalogue restoration