Code refactor includes last comments