more code compactness