Black Cat/Refactor