326 - refactoring