trevor's suggestions / clean up