presentational cleanup