Fixat refactoring