refactor fixed