Complexity overload alert --- trim the fat a bit ;)