Styles cleanup
More cleanup.