Further cleanup
Further cleanup
More cleanup
Significant cleanup and view adjustments