doc block and type hint cleanup