Refactoring + flat shading and wireframe rendering