code cleanup and change defaults