changing some variables and indentation