Apit 133 refactor logging