Simple refactoring to properly use AutoMapper.