refactoring to simplify view logic a bit
oops another refactoring, oy