Small refactors
Small refactors

Summary: Going to make more changes here soon and wanted to apply some small changes first.

Reviewed By: jknoxville

Differential Revision: D26078645

fbshipit-source-id: 3a2bcd593b893160b5a332c858a514ebe89d3f4d

facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper,facebook/flipper