Code cleanup, still need to do 3D style data