Cleanup (mostly white-spaces).