cleaned up 1/3 views