Code review

##Subject
Feature ready to :shipit: