few changes to make it cleaner

Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>