partial: Refactoring a bit...