renamed stuff to make it more readable