idea cleanup
TimW messing about with new structure