got rid of some unnecessary view logic