Style changes and boundary adjustments.

Style changes and boundary adjustments.