Do a better job separating the data from the presentation.