Comments nad logger error messages cleaned up