Some style rework.