refactor suggestions