Simplify structure #372

Closed bradmartin closed 5 years ago