Type hinting and docblock update