Readability/compactness fix