diff --git a/README.md b/README.md
index cb1b70e..eb8941f 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@
 
 [![Build Status](https://travis-ci.com/simplexspatial/osm4scala.svg?branch=master)](https://travis-ci.com/simplexspatial/osm4scala)
 [![Coverage Status](https://coveralls.io/repos/github/simplexspatial/osm4scala/badge.svg?branch=master)](https://coveralls.io/github/simplexspatial/osm4scala?branch=master)
+[![Quality gate](https://sonarcloud.io/api/project_badges/quality_gate?project=simplexspatial_osm4scala)](https://sonarcloud.io/dashboard?id=simplexspatial_osm4scala)
 [![Gitter](https://img.shields.io/gitter/room/osm4scala/talk.svg)](https://gitter.im/osm4scala/talk)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/angelcervera/osm4scala/master/LICENSE.md)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fangelcervera%2Fosm4scala.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fangelcervera%2Fosm4scala?ref=badge_shield)
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
+
 
 **Scala library** and **Spark Connector** focus on parsing [PBF2 OpenStreetMap files](https://wiki.openstreetmap.org/wiki/PBF_Format) as iterators.
 
@@ -446,6 +447,8 @@ For free community support, there are two channels:
 
 
 ## Contributing
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
+
 First of all, if you arrived to this point, thanks for at least think about contributing!!!
 
 ### Way to contribute
diff --git a/core/src/main/scala/com/acervera/osm4scala/model/RelationMemberEntity.scala b/core/src/main/scala/com/acervera/osm4scala/model/RelationMemberEntity.scala
index 637025f..b02325e 100644
--- a/core/src/main/scala/com/acervera/osm4scala/model/RelationMemberEntity.scala
+++ b/core/src/main/scala/com/acervera/osm4scala/model/RelationMemberEntity.scala
@@ -33,5 +33,4 @@ object RelationMemberEntityTypes extends Enumeration {
   val Unrecognized = Value(3)
 }
 
-// FIXME: relationTypes should be singular instead plural.
 case class RelationMemberEntity(id: Long, relationTypes: RelationMemberEntityTypes.Value, role: String)
diff --git a/core/src/main/scala/com/acervera/osm4scala/model/WayEntity.scala b/core/src/main/scala/com/acervera/osm4scala/model/WayEntity.scala
index ba46a30..9cd4556 100644
--- a/core/src/main/scala/com/acervera/osm4scala/model/WayEntity.scala
+++ b/core/src/main/scala/com/acervera/osm4scala/model/WayEntity.scala
@@ -35,7 +35,7 @@ case class WayEntity(id: Long, nodes: Seq[Long], tags: Map[String, String]) exte
 
   override val osmModel: OSMTypes.Value = OSMTypes.Way
 
-  object WayEntityTypes extends Enumeration { // TODO: How to know the type ?????
+  object WayEntityTypes extends Enumeration {
     val Open, Close, Area, CombinedClosedPolylineArea = Value
   }
 
diff --git a/spark/src/main/scala/com/acervera/osm4scala/spark/OSMDataFinder.scala b/spark/src/main/scala/com/acervera/osm4scala/spark/OSMDataFinder.scala
index d4b4d47..00da8f8 100644
--- a/spark/src/main/scala/com/acervera/osm4scala/spark/OSMDataFinder.scala
+++ b/spark/src/main/scala/com/acervera/osm4scala/spark/OSMDataFinder.scala
@@ -57,7 +57,7 @@ object OSMDataFinder {
         * Check that It's OSMData string and a true block as well.
         * @return
         */
-      def isFalsePositive(): Boolean = false // TODO: Need implementation.
+      def isFalsePositive(): Boolean = false // TODO: Needs implementation.
 
       /**
         * Read next n bytes from the stream. If are not enough, return None.