Revert "Revert "Small changes in style.""

This reverts commit ed505ec40df782a99a5b5b3abe2bdadd02b8824d.