QA/Refactor: Rename $self to $base for clarity