Refactoring
Resolved some OpenGL warnings