[Code quality] Fixed minor issues