Adjustments to better adhere to proper styling.