STY : more aggressive refactoring

 - should still be backwards compatible