[FIX] variables names and indentations