changed whitespaces, variable names and tests