refactor done, before merging