Refactor: Suggested Changes