Refactoring:  Fixed checkstyle errors.  Reduced method length.  Simplified.  Decided to bump max acceptable method length to 15.  Happy to discuss why.