Some cleanup and add color to VAO.