renamed some vars
cleanup