changed Names, deleted unused variables