More work on whitespace