Refactoring, mapping out FS response.