Issue #77 - Updates for code smells and partial calls.