Cleaning up architecture