Refactor cleanup