Cleaning Code for Basic Architecture