minor changes (cleanup)