[#5] Improving logging