diff --git a/src/chip_data/hei_chip_data.hpp b/src/chip_data/hei_chip_data.hpp
index 685ed12..26cfb75 100644
--- a/src/chip_data/hei_chip_data.hpp
+++ b/src/chip_data/hei_chip_data.hpp
@@ -3,6 +3,4 @@
 #include <hei_includes.hpp>
 
 namespace libhei
-{
-
-} // end namespace libhei
+{} // end namespace libhei
diff --git a/src/chip_data/hei_chip_data_stream.hpp b/src/chip_data/hei_chip_data_stream.hpp
index e675420..41cb94e 100755
--- a/src/chip_data/hei_chip_data_stream.hpp
+++ b/src/chip_data/hei_chip_data_stream.hpp
@@ -111,8 +111,8 @@
  *   @param             o_right: A pointer to where the data is stored
  *   @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(uint16_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(uint16_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be16toh(o_right);
@@ -123,8 +123,8 @@
  *  @param             o_right: A pointer to where the data is stored
  *  @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(int16_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(int16_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be16toh(o_right);
@@ -135,8 +135,8 @@
  *  @param             o_right: A pointer to where the data is stored
  *  @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(uint32_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(uint32_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be32toh(o_right);
@@ -147,8 +147,8 @@
  *  @param             o_right: A pointer to where the data is stored
  *  @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(int32_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(int32_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be32toh(o_right);
@@ -159,8 +159,8 @@
  *  @param             o_right: A pointer to where the data is stored
  *  @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(uint64_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(uint64_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be64toh(o_right);
@@ -171,8 +171,8 @@
  *  @param             o_right: A pointer to where the data is stored
  *  @return            *this:   A pointer to "this" object
  **/
-template <> inline
-ChipDataStream& ChipDataStream::operator>>(int64_t& o_right)
+template <>
+inline ChipDataStream& ChipDataStream::operator>>(int64_t& o_right)
 {
     read(&o_right, sizeof(o_right));
     be64toh(o_right);