renamed unused variables properly

renamed unused variables properly + minor indentation fixes