Formatting/doc fixes