comment cleanup / methods rename / change so can easily change hidden view state