More refactoring
Signed-off-by: Chris Conley <chrisc93@vt.edu>