Reworking style, etc.