fix review comments + remove a duplicated method