Continuing Refactoring (Party Done)