Cleaned up video selection function