Minor refactoring, to move resolver out (no need to be inner class); remove unneeded annotations