1. Remove unused vars
2. Remove errored overrided docblock to use parent doc
3. Add/fix type hinting in docblock to prevent errors on IDE
4. Add some type hinting on methods