cleaned up the resolveAction in the RestController