Renamed controller data struct
Spaces to tabs