code refactor
updates