Remove chaining with assignment and change naming