a couple small changes to make things clearer