general refactor - behavior acceptable