diff --git a/src/libebus/bus.cpp b/src/libebus/bus.cpp
index c9fd742f..f0da3073 100644
--- a/src/libebus/bus.cpp
+++ b/src/libebus/bus.cpp
@@ -358,10 +358,10 @@ int Bus::recvSlaveDataAndCRC(SymbolString& result)
 
 		byte_recv = recvByte();
 		retval = result.push_back(byte_recv, true, updateCrc);
-		if (retval<0)
+		if (retval < 0)
 			return retval;
 
-		if (retval==RESULT_IN_ESC)
+		if (retval == RESULT_IN_ESC)
 			needed++;
 		else if (result.size() == 1) { // NN received
 			NN = result[0];
@@ -374,7 +374,7 @@ int Bus::recvSlaveDataAndCRC(SymbolString& result)
 		}
 	}
 
-	if (retval==RESULT_IN_ESC)
+	if (retval == RESULT_IN_ESC)
 		return RESULT_ERR_ESC;
 
 	if (updateCrc || crc_calc != result[result.size()-1])
diff --git a/src/libebus/bus.h b/src/libebus/bus.h
index 59fde9ed..d752dbd7 100644
--- a/src/libebus/bus.h
+++ b/src/libebus/bus.h
@@ -86,4 +86,4 @@ private:
 
 } //namespace
 
-#endif // LIBEBUS_BUS_HPP_
+#endif // LIBEBUS_BUS_H_