Clean up refactor