removed stuff we don't need
changed variable to make it more readable