Whitespace, typehints, use aliasing + unnecessary defaults