Assignment 4
Cleanup for assignment 2 reusing other shaders