Merge wth 3.6 & clean code