Simplify the internal architecture