Made the wait duration less annoying while still being illustrative
Added a few lambdas
Used a lambda with std::sort and used a ranged for.