[#6905] Refactored

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
8 files changed