Removed Hardcoded Strings