minor update, naming, cleanup