Minor style changes for compactness