Cleaned up refactor modules.