More consolidation and de-duplication of code...