Looks good to me.
---
While you're moving code around, you could fix the typo below and change
method comments to javadoc style ('*' => '**'')accidnetly and
Looks good to me.
---
While you're moving code around, you could fix the typo below and change
method comments to javadoc style ('*' => '**'')accidnetly and