Minor refactoring
Minor refactoring

vhl/fakefs,openSUSE/fakefs,bquorning/fakefs,onehub/fakefs,deployable/fakefs,anthonyryan1/fakefs,zimbatm/fakefs,pivotal-cf-experimental/fakefs,marxarelli/fakefs,defunkt/fakefs,lgierth/fakefs,eventualbuddha/fakefs,moretea/fakefs,bf4/fakefs,dekz/fakefs,1234-/fakefs,fakefs/fakefs