type hinting
code cleanup