move indices to single location
'track by' keyword for repeat expressions
whitespaces lexing corrected