removed unnescessary variables