go on refactor

go on refactor