Refactoring, returns and templates.