Added annotations for return types
Removed empty line
Removed redundant imports and insert annotated type hinting where appropriate
Removed unnecessary fully qualified named for type hinting
Various updates as a result of PhpStorm's 'inspect code'