Comments and cleaning before merging

Change-Id: If1b45575f0e528d5617c1f689fab07eaf5d87bee