Fixed refactoring parts.