(Fix) Refactoring