Be more verbose and remove erb refs