some detail cleaning on initial animation