Update data structure, add missing parameter and fix indent