simplify view logic

@6 can you take a look at this? i think my simplification works, but i want to run it by you.