Simplify structure immensely