Refactor Suggestions