Few minor changes where made (comments fixes)