Minor changes, clean surface