More tidyin!
Work in progress