light refactoring to have update! call move-straight! and bounce! routines