minor changes, clean