UC-142 Addressed some code review feedback.

* Additional type hinting
* Moving repetitive action out of a loop
* Removing unused setData method