diff --git a/Client.cpp b/Client.cpp
index 1189dbd2..eb189e8f 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -63,9 +63,7 @@ CClient::~CClient() {
 void CClient::ReadLine(const CString& sData) {
 	CString sLine = sData;
 
-	while ((sLine.Right(1) == "\r") || (sLine.Right(1) == "\n")) {
-		sLine.RightChomp();
-	}
+	sLine.TrimRight("\n\r");
 
 	DEBUG_ONLY(cout << "(" << ((m_pUser) ? m_pUser->GetUserName() : GetRemoteIP()) << ") CLI -> ZNC [" << sLine << "]" << endl);
 
diff --git a/IRCSock.cpp b/IRCSock.cpp
index b11a39c7..beac360e 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -71,9 +71,7 @@ void CIRCSock::Quit() {
 void CIRCSock::ReadLine(const CString& sData) {
 	CString sLine = sData;
 
-	while ((sLine.Right(1) == "\r") || (sLine.Right(1) == "\n")) {
-		sLine.RightChomp();
-	}
+	sLine.TrimRight("\n\r");
 
 	DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") IRC -> ZNC [" << sLine << "]" << endl);