Refactoring
Signed-off-by:Matt Haidet <matthaidet17@marist.com>