minor cleanup and adjustments