Review round №4: separate vars for variables with assignment, removed hardcoded timeouts