some organizing

Signed-off-by: qxh38 <qxh38@case.edu>