Some braces, and also return type documentation