Changed from using glut to glfw. Still not feature complete with where glut was.
Cleaned up some more.