Few comments and class change