[#6694] Refactoring and cleanup

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