Beautification: Replaced explicit changed User with template