Clearing up #36 making this simpler

yeah over engineered that quite a lot ....
Small formatting change for #30