Refactor - let spring do the magic