Start of refactoring to improve specability