Refactoring suggestions