Cleaned up the Renamer code