Updated reference parsing
Simplified movements formatting