* Update typing syntax * Replace typing imports with ones from collections where possible * Changes after review