Rectoring and changes in line with ml4j-core