Removed Client-Specific Naming & Code