Update constant names
Remove singleton
Fix undone refactor typos
Remove AFNetworking dependency