Step 1 of refactoring to simplify/consolidate view api usage