Some cleanups in presenters