White-spaces cleanup.