Code style modification after @stof comments