Refactor cleanup 3