Quick Cleanup

Do a quick cleanup to get this in a more working state for RTV.