cleanup
minor adjustments, cleanup