Resolved last two PSR2 violations