326 - Refactoring