WeilerAtherton class first cleanup