More refactoring

Not sure about "CameraAngle," I don't think it's right. There are some things that need to be fixed like x = y and z = x in some methods.