Re: Some refactoring proposals