Attempted some optimization.  Tail tucked between legs for now.