renamed variables and cleanup
cleanup