Cleanup the code and adding 3d model.