[core][rock] Comments have been updated, little refactoring