Update comments, spacing
Add 'throws Exception' to Resolver.resolve interface method