Refactor: Removed todo that is done and fixed up phpDoc