initial pass on browse controller refactors