cleaned code and VBO