Clean up the styling (take 2)