cosmetic refactors
version bump: v1.6.25