Updates to style and housekeeping.