Continued adjustments to style and structre