WIP: some tidy up - nothing really functional here