reorganised and cleaned up #23

Closed mkruijt closed 6 years ago