I've got rid of most of the 'white space' ... still a few small bits to go.