Changed logging code to be macro-based