Clean up logging based on feedback, add node name logging