Refactoring 8-P