Just a side issue of refactoring and not having another "performance" pass over the code.