Rename variables and small adjusts in movimento.py class