Cleaned up and renaming