Refactoring - Assignment