Code review

##Subject
Feature ready to :shipit: 

this is a good note