Cleaning up dave's code

Waiting on the texture now