DOC Slightly more readable code