multiple refactor fixed commit