Re: refactoring alternatives