Fixed unnecessary variables