rename some variables legibly
add test