update refactory removed hard code