FIX : Refactoring