Code assignment separation of concerns updated