Cleaner refactor